Merge commit 'upstream/0.1.2' into master.experimental
authorMatteo F. Vescovi <m.vescovi@revese.it>
Sat, 31 Dec 2011 11:16:35 +0000 (12:16 +0100)
committerMatteo F. Vescovi <m.vescovi@revese.it>
Sat, 31 Dec 2011 11:16:35 +0000 (12:16 +0100)
commit87b31825c3df9d13f8f7906ffe0d11e46583afa0
tree2590e0fd470f00fada540de9400939cd406103bd
parent8c0fddfc496f358f826e766cda008e2ebfff36f3
parent831966cf9a6f66109a36ee029035830df4bccd36
Merge commit 'upstream/0.1.2' into experimental